pass in user data.

Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.

	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.

diff --git a/ChangeLog b/ChangeLog
index ecf5313b2a3ab5d47728e367e4db43a0e8f0f701..3e246ab81858e00a4989efb27ebf59afbbe8287b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ecf5313b2a3ab5d47728e367e4db43a0e8f0f701..3e246ab81858e00a4989efb27ebf59afbbe8287b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ecf5313b2a3ab5d47728e367e4db43a0e8f0f701..3e246ab81858e00a4989efb27ebf59afbbe8287b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ecf5313b2a3ab5d47728e367e4db43a0e8f0f701..3e246ab81858e00a4989efb27ebf59afbbe8287b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ecf5313b2a3ab5d47728e367e4db43a0e8f0f701..3e246ab81858e00a4989efb27ebf59afbbe8287b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ecf5313b2a3ab5d47728e367e4db43a0e8f0f701..3e246ab81858e00a4989efb27ebf59afbbe8287b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ecf5313b2a3ab5d47728e367e4db43a0e8f0f701..3e246ab81858e00a4989efb27ebf59afbbe8287b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 150c166bc7df55cfc2e512a49178f31e737dcc8b..dfbdf3e2adef4e8843a9721359f5e8fc0b8115fe 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1031,6 +1031,11 @@ gtk_tree_view_destroy (GtkObject *object)
     gtk_tree_view_search_dialog_destroy (search_dialog,
                                                     tree_view);
 
+  if (tree_view->priv->search_user_data)
+    {
+      (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
+      tree_view->priv->search_user_data = NULL;
+    }
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -8902,7 +8907,7 @@ gtk_tree_view_search_iter (GtkTreeModel     *model,
   GtkTreeViewColumn *column =
     gtk_tree_view_get_column (tree_view, tree_view->priv->search_column);
   
-  if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter))
+  if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter, tree_view->priv->search_user_data))
     {
       (*count)++;
       
@@ -8937,7 +8942,7 @@ gtk_tree_view_search_iter (GtkTreeModel     *model,
   
   while (gtk_tree_model_iter_next (model, iter))
     {
-      if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter))
+      if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter, tree_view->priv->search_user_data))
         {
           (*count)++;
           if (*count == n)

diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index d748ccf4a1044aa460a4111387d7d052c84cb121..2c10f253c93728ab26c8d4ab564f70be00c24bd2 100644 (file)
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -119,7 +119,8 @@ typedef gboolean (* GtkTreeViewDroppableFunc)  (GtkTreeView             *tree_vi
 typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel            *model,
                                                gint                     column,
                                                gchar                   *key,
-                                               GtkTreeIter             *iter);
+                                               GtkTreeIter             *iter,
+                                               gpointer                 search_data);
 
 
 /* Creators */